build: Replace cogl-pango with pango dependency

As CoglPango will be merged with Clutter and GNOME Shell
only uses Pango directly, so depend on that instead

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3494>

diff --git a/meson.build b/meson.build
index 0a994edbe0f91f268bcab47f0be219fc5baaa5ed..ea351eb4c9f9ef0d77fef7c059ce759f8ff512b8 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -14,7 +14,6 @@ mutter_api_version = '16'
 
 clutter_pc = 'mutter-clutter-' + mutter_api_version
 cogl_pc = 'mutter-cogl-' + mutter_api_version
-cogl_pango_pc = 'mutter-cogl-pango-' + mutter_api_version
 mtk_pc = 'mutter-mtk-' + mutter_api_version
 libmutter_pc = 'libmutter-' + mutter_api_version
 libmutter_test_pc = 'libmutter-test-' + mutter_api_version
@@ -33,6 +32,7 @@ systemd_req = '>= 246'
 ibus_req = '>= 1.5.19'
 gnome_desktop_req = '>= 40'
 pipewire_req = '>= 0.3.49'
+pango_req = '>= 1.46.0'
 
 nm_req = '>= 1.10.4'
 secret_req = '>= 0.18'
@@ -83,12 +83,12 @@ libxml_dep = dependency('libxml-2.0')
 clutter_dep = dependency(clutter_pc, version: mutter_req)
 mtk_dep = dependency(mtk_pc, version: mutter_req)
 cogl_dep = dependency(cogl_pc, version: mutter_req)
-cogl_pango_dep = dependency(cogl_pango_pc, version: mutter_req)
 mutter_dep = dependency(libmutter_pc, version: mutter_req)
 polkit_dep = dependency('polkit-agent-1', version: polkit_req)
 ibus_dep = dependency('ibus-1.0', version: ibus_req)
 schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
 gnome_desktop_dep = dependency('gnome-desktop-4', version: gnome_desktop_req)
+pango_dep = dependency('pango', version: pango_req)
 
 have_x11 = mutter_dep.get_variable('have_x11') == 'true'
 have_x11_client = mutter_dep.get_variable('have_x11_client') == 'true'

diff --git a/src/meson.build b/src/meson.build
index 1927c5a6db4732964f7f5c2c3c86882fc7149321..bdb195656cda0b8a0052f3724692b2f4d3aff3f7 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -69,12 +69,12 @@ gnome_shell_deps = [
   gjs_dep,
   mtk_dep,
   clutter_dep,
-  cogl_pango_dep,
   gi_dep,
   polkit_dep,
   gcr_dep,
   libsystemd_dep,
   libpipewire_dep,
+  pango_dep,
 ]
 
 if have_x11_client

diff --git a/src/st/meson.build b/src/st/meson.build
index b436d510d01b448acf868344fd10dce6ac3f4df8..899fa788cfad3977f191bb63e3502fee0982a50a 100644 (file)
--- a/src/st/meson.build
+++ b/src/st/meson.build
@@ -183,7 +183,16 @@ st_cflags = [
 libst = shared_library('st-' + mutter_api_version,
   sources: st_gir_sources + st_nogir_sources + croco_sources,
   c_args: st_cflags,
-  dependencies: [mtk_dep, clutter_dep, mutter_dep, libxml_dep, gdk_pixbuf_dep, m_dep, schemas_dep],
+  dependencies: [
+    mtk_dep,
+    clutter_dep,
+    mutter_dep,
+    libxml_dep,
+    gdk_pixbuf_dep,
+    m_dep,
+    schemas_dep,
+    pango_dep,
+  ],
   build_rpath: mutter_typelibdir,
   install_rpath: mutter_typelibdir,
   install_dir: pkglibdir,